merge trunk
authorK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 14:50:25 +0000 (23:50 +0900)
committerK. Handa <handa@gnu.org>
Fri, 11 Oct 2013 14:50:25 +0000 (23:50 +0900)

Trivial merge